From 643898034e176f5883ab70203ed01670d809c3b7 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 1 Oct 2009 12:28:54 +0100 Subject: [PATCH] stubdom/minios: re-structure headers As part of making stubdom usable on NetBSD, it is necessary to restructure the minios headers to avoid conflicts with NetBSD's crossbuild toolchain. Signed-off-by: Christoph Egger Acked-by: Samuel Thibault --- extras/mini-os/arch/ia64/common.c | 26 +++++++++++----------- extras/mini-os/arch/ia64/debug.c | 2 +- extras/mini-os/arch/ia64/efi.c | 10 ++++----- extras/mini-os/arch/ia64/fw.S | 12 +++++----- extras/mini-os/arch/ia64/gen_off.c | 8 +++---- extras/mini-os/arch/ia64/ia64.S | 12 +++++----- extras/mini-os/arch/ia64/ivt.S | 10 ++++----- extras/mini-os/arch/ia64/mm.c | 4 ++-- extras/mini-os/arch/ia64/sal.c | 8 +++---- extras/mini-os/arch/ia64/sched.c | 10 ++++----- extras/mini-os/arch/ia64/time.c | 10 ++++----- extras/mini-os/arch/ia64/xencomm.c | 4 ++-- extras/mini-os/arch/x86/ioremap.c | 10 ++++----- extras/mini-os/arch/x86/mm.c | 12 +++++----- extras/mini-os/arch/x86/sched.c | 20 ++++++++--------- extras/mini-os/arch/x86/setup.c | 4 ++-- extras/mini-os/arch/x86/time.c | 14 ++++++------ extras/mini-os/arch/x86/traps.c | 12 +++++----- extras/mini-os/arch/x86/x86_32.S | 4 ++-- extras/mini-os/arch/x86/x86_64.S | 4 ++-- extras/mini-os/blkfront.c | 15 +++++++------ extras/mini-os/console/console.c | 16 +++++++------- extras/mini-os/console/xencons_ring.c | 20 ++++++++--------- extras/mini-os/events.c | 10 ++++----- extras/mini-os/fbfront.c | 14 ++++++------ extras/mini-os/fs-front.c | 17 +++++++------- extras/mini-os/gntmap.c | 7 +++--- extras/mini-os/gnttab.c | 8 +++---- extras/mini-os/hypervisor.c | 7 +++--- extras/mini-os/kernel.c | 32 +++++++++++++-------------- extras/mini-os/lib/math.c | 6 ++--- extras/mini-os/lib/printf.c | 14 ++++++------ extras/mini-os/lib/stack_chk_fail.c | 4 ++-- extras/mini-os/lib/string.c | 8 +++---- extras/mini-os/lib/xmalloc.c | 12 +++++----- extras/mini-os/mm.c | 12 +++++----- extras/mini-os/netfront.c | 18 +++++++-------- extras/mini-os/pcifront.c | 16 ++++++++------ extras/mini-os/sched.c | 20 ++++++++--------- extras/mini-os/xenbus/xenbus.c | 22 +++++++++--------- tools/libxc/xc_minios.c | 14 ++++++------ 41 files changed, 247 insertions(+), 241 deletions(-) diff --git a/extras/mini-os/arch/ia64/common.c b/extras/mini-os/arch/ia64/common.c index c82e604bac..14958cd4ec 100644 --- a/extras/mini-os/arch/ia64/common.c +++ b/extras/mini-os/arch/ia64/common.c @@ -31,19 +31,19 @@ */ -#include "os.h" -#include "types.h" -#include "lib.h" -#include "page.h" -#include "xen/xen.h" -#include "privop.h" -#include "xen/callback.h" -#include "ia64_cpu.h" -#include "hypervisor.h" -#include "events.h" -#include "console.h" -#include "time.h" -#include "xmalloc.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* For more console boot messages. */ diff --git a/extras/mini-os/arch/ia64/debug.c b/extras/mini-os/arch/ia64/debug.c index f5b378381f..f0e57776f7 100644 --- a/extras/mini-os/arch/ia64/debug.c +++ b/extras/mini-os/arch/ia64/debug.c @@ -27,7 +27,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "os.h" +#include static const char *ia64_vector_names[] = { "VHPT Translation", /* 0 */ diff --git a/extras/mini-os/arch/ia64/efi.c b/extras/mini-os/arch/ia64/efi.c index cdb25b33ec..009375e717 100644 --- a/extras/mini-os/arch/ia64/efi.c +++ b/extras/mini-os/arch/ia64/efi.c @@ -28,11 +28,11 @@ */ -#include "os.h" -#include "efi.h" -#include "page.h" -#include "lib.h" -#include "console.h" +#include +#include +#include +#include +#include /* The implementation is in fw.S. */ diff --git a/extras/mini-os/arch/ia64/fw.S b/extras/mini-os/arch/ia64/fw.S index ef2c4d2d2f..2ed4dc3071 100644 --- a/extras/mini-os/arch/ia64/fw.S +++ b/extras/mini-os/arch/ia64/fw.S @@ -28,12 +28,12 @@ */ -#include "asm.h" -#include "page.h" -#include "ia64_cpu.h" -#include "ia64_fpu.h" -#include "offsets.h" -#include "xen/xen.h" +#include +#include +#include +#include +#include +#include /* diff --git a/extras/mini-os/arch/ia64/gen_off.c b/extras/mini-os/arch/ia64/gen_off.c index 2c67a8c352..f547f233cb 100644 --- a/extras/mini-os/arch/ia64/gen_off.c +++ b/extras/mini-os/arch/ia64/gen_off.c @@ -25,10 +25,10 @@ * SUCH DAMAGE. * */ -#include "types.h" -#include "sched.h" -#include "xen/xen.h" -#include "xen/arch-ia64.h" +#include +#include +#include +#include #define DEFINE(sym, val) \ asm volatile("\n->" sym " %0 /* " #val " */": : "i" (val)) diff --git a/extras/mini-os/arch/ia64/ia64.S b/extras/mini-os/arch/ia64/ia64.S index adcf1769a2..8fde08977d 100644 --- a/extras/mini-os/arch/ia64/ia64.S +++ b/extras/mini-os/arch/ia64/ia64.S @@ -23,12 +23,12 @@ -#include "asm.h" -#include "page.h" -#include "ia64_cpu.h" -#include "ia64_fpu.h" -#include "privop.h" -#include "offsets.h" +#include +#include +#include +#include +#include +#include diff --git a/extras/mini-os/arch/ia64/ivt.S b/extras/mini-os/arch/ia64/ivt.S index 8971b3bee9..863a498213 100644 --- a/extras/mini-os/arch/ia64/ivt.S +++ b/extras/mini-os/arch/ia64/ivt.S @@ -24,11 +24,11 @@ */ -#include "asm.h" -#include "page.h" -#include "ia64_cpu.h" -#include "privop.h" -#include "offsets.h" +#include +#include +#include +#include +#include /* General register usage in interrupt handling: diff --git a/extras/mini-os/arch/ia64/mm.c b/extras/mini-os/arch/ia64/mm.c index c6aef8331f..b171f75dc3 100644 --- a/extras/mini-os/arch/ia64/mm.c +++ b/extras/mini-os/arch/ia64/mm.c @@ -26,8 +26,8 @@ */ -#include "os.h" -#include "mm.h" +#include +#include #define MAX_MEM_AREA 5 diff --git a/extras/mini-os/arch/ia64/sal.c b/extras/mini-os/arch/ia64/sal.c index 286e5be38c..7fa7f94acd 100644 --- a/extras/mini-os/arch/ia64/sal.c +++ b/extras/mini-os/arch/ia64/sal.c @@ -27,10 +27,10 @@ * */ -#include "os.h" -#include "lib.h" -#include "console.h" -#include "page.h" +#include +#include +#include +#include static struct ia64_fdesc sal_fdesc; diff --git a/extras/mini-os/arch/ia64/sched.c b/extras/mini-os/arch/ia64/sched.c index 5eea71e077..ae9e661546 100644 --- a/extras/mini-os/arch/ia64/sched.c +++ b/extras/mini-os/arch/ia64/sched.c @@ -25,11 +25,11 @@ */ -#include "types.h" -#include "sched.h" -#include "lib.h" -#include "xmalloc.h" -#include "mm.h" +#include +#include +#include +#include +#include /* The function is implemented in fw.S */ extern void thread_starter(void); diff --git a/extras/mini-os/arch/ia64/time.c b/extras/mini-os/arch/ia64/time.c index 4a3a558dc3..53412660f7 100644 --- a/extras/mini-os/arch/ia64/time.c +++ b/extras/mini-os/arch/ia64/time.c @@ -27,11 +27,11 @@ * SUCH DAMAGE. */ -#include "os.h" -#include "console.h" -#include "time.h" -#include "efi.h" -#include "events.h" +#include +#include +#include +#include +#include struct timespec os_time; static uint64_t itc_alt; /* itc on last update. */ diff --git a/extras/mini-os/arch/ia64/xencomm.c b/extras/mini-os/arch/ia64/xencomm.c index fccfee2f1e..9719e49f18 100644 --- a/extras/mini-os/arch/ia64/xencomm.c +++ b/extras/mini-os/arch/ia64/xencomm.c @@ -23,10 +23,10 @@ */ -#include +#include #include #include -#include +#include #include #include diff --git a/extras/mini-os/arch/x86/ioremap.c b/extras/mini-os/arch/x86/ioremap.c index d94f4e72a7..f55d9e078e 100644 --- a/extras/mini-os/arch/x86/ioremap.c +++ b/extras/mini-os/arch/x86/ioremap.c @@ -21,11 +21,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Map a physical address range into virtual address space with provided * flags. Return a virtual address range it is mapped to. */ diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c index 723fc567e9..8d688fc25a 100644 --- a/extras/mini-os/arch/x86/mm.c +++ b/extras/mini-os/arch/x86/mm.c @@ -34,12 +34,12 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #ifdef MM_DEBUG diff --git a/extras/mini-os/arch/x86/sched.c b/extras/mini-os/arch/x86/sched.c index 9b98b93a55..8a05b58dcb 100644 --- a/extras/mini-os/arch/x86/sched.c +++ b/extras/mini-os/arch/x86/sched.c @@ -35,16 +35,16 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef SCHED_DEBUG diff --git a/extras/mini-os/arch/x86/setup.c b/extras/mini-os/arch/x86/setup.c index 8509079d3e..923901e595 100644 --- a/extras/mini-os/arch/x86/setup.c +++ b/extras/mini-os/arch/x86/setup.c @@ -26,8 +26,8 @@ * */ -#include - +#include +#include /* for printk, memcpy */ /* * Shared page for communicating with the hypervisor. diff --git a/extras/mini-os/arch/x86/time.c b/extras/mini-os/arch/x86/time.c index a55bf59ee6..89bc3826e8 100644 --- a/extras/mini-os/arch/x86/time.c +++ b/extras/mini-os/arch/x86/time.c @@ -32,13 +32,13 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /************************************************************************ * Time functions diff --git a/extras/mini-os/arch/x86/traps.c b/extras/mini-os/arch/x86/traps.c index f641d90f2e..516d133ec8 100644 --- a/extras/mini-os/arch/x86/traps.c +++ b/extras/mini-os/arch/x86/traps.c @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* * These are assembler stubs in entry.S. diff --git a/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os/arch/x86/x86_32.S index e1426acac0..fb3e30a357 100644 --- a/extras/mini-os/arch/x86/x86_32.S +++ b/extras/mini-os/arch/x86/x86_32.S @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include .section __xen_guest diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index a8b1933da2..a65e5d5d8e 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include .section __xen_guest diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index bba1a2ffa6..a451e98f02 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -3,17 +3,18 @@ * Based on netfront.c. */ -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #ifndef HAVE_LIBC diff --git a/extras/mini-os/console/console.c b/extras/mini-os/console/console.c index 81cedcbd64..1bd0405f4a 100644 --- a/extras/mini-os/console/console.c +++ b/extras/mini-os/console/console.c @@ -34,14 +34,14 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/extras/mini-os/console/xencons_ring.c b/extras/mini-os/console/xencons_ring.c index a7a9827c00..3bb408f70a 100644 --- a/extras/mini-os/console/xencons_ring.c +++ b/extras/mini-os/console/xencons_ring.c @@ -1,16 +1,16 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include DECLARE_WAIT_QUEUE_HEAD(console_queue); diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index c907e652b9..2f359a54e7 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -16,11 +16,11 @@ **************************************************************************** */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define NR_EVS 1024 diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c index 1406de0212..8cf1721975 100644 --- a/extras/mini-os/fbfront.c +++ b/extras/mini-os/fbfront.c @@ -4,16 +4,16 @@ * Based on blkfront.c. */ -#include -#include -#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include DECLARE_WAIT_QUEUE_HEAD(kbdfront_queue); diff --git a/extras/mini-os/fs-front.c b/extras/mini-os/fs-front.c index 7c4d68df5a..dd664caebc 100644 --- a/extras/mini-os/fs-front.c +++ b/extras/mini-os/fs-front.c @@ -25,15 +25,16 @@ */ #undef NDEBUG -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #define preempt_disable() #define preempt_enable() diff --git a/extras/mini-os/gntmap.c b/extras/mini-os/gntmap.c index abbd91ab33..22ed450c8c 100644 --- a/extras/mini-os/gntmap.c +++ b/extras/mini-os/gntmap.c @@ -30,12 +30,13 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include +#include #include #include #include -#include "gntmap.h" +#include #define DEFAULT_MAX_GRANTS 128 diff --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c index 9b350523d5..ebfa8ac554 100644 --- a/extras/mini-os/gnttab.c +++ b/extras/mini-os/gnttab.c @@ -15,10 +15,10 @@ * **************************************************************************** */ -#include -#include -#include -#include +#include +#include +#include +#include #define NR_RESERVED_ENTRIES 8 diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index dad8b59609..b4688a059a 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -25,9 +25,10 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include +#include #define active_evtchns(cpu,sh,idx) \ ((sh)->evtchn_pending[idx] & \ diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 33c91b59ff..19e4400be4 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -27,22 +27,22 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c index 55ece1ed51..00a13a5004 100644 --- a/extras/mini-os/lib/math.c +++ b/extras/mini-os/lib/math.c @@ -55,9 +55,9 @@ * $FreeBSD: src/sys/libkern/divdi3.c,v 1.6 1999/08/28 00:46:31 peter Exp $ */ -#include -#include -#include +#include +#include +#include /* On ia64 these functions lead to crashes. These are replaced by * assembler functions. */ diff --git a/extras/mini-os/lib/printf.c b/extras/mini-os/lib/printf.c index a986616586..833bb96a32 100644 --- a/extras/mini-os/lib/printf.c +++ b/extras/mini-os/lib/printf.c @@ -56,13 +56,13 @@ #if !defined HAVE_LIBC -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * simple_strtoul - convert a string to an unsigned long diff --git a/extras/mini-os/lib/stack_chk_fail.c b/extras/mini-os/lib/stack_chk_fail.c index ade0045f0a..05aea20059 100644 --- a/extras/mini-os/lib/stack_chk_fail.c +++ b/extras/mini-os/lib/stack_chk_fail.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include void __stack_chk_fail(void) { diff --git a/extras/mini-os/lib/string.c b/extras/mini-os/lib/string.c index a6f2abe0b0..8b241464e2 100644 --- a/extras/mini-os/lib/string.c +++ b/extras/mini-os/lib/string.c @@ -57,10 +57,10 @@ int ffsll (long long int lli) #if !defined HAVE_LIBC -#include -#include -#include -#include +#include +#include +#include +#include int memcmp(const void * cs,const void * ct,size_t count) { diff --git a/extras/mini-os/lib/xmalloc.c b/extras/mini-os/lib/xmalloc.c index c33c48ab41..14fe796131 100644 --- a/extras/mini-os/lib/xmalloc.c +++ b/extras/mini-os/lib/xmalloc.c @@ -36,12 +36,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifndef HAVE_LIBC static MINIOS_LIST_HEAD(freelist); diff --git a/extras/mini-os/mm.c b/extras/mini-os/mm.c index a5338b0053..743d45d051 100644 --- a/extras/mini-os/mm.c +++ b/extras/mini-os/mm.c @@ -34,13 +34,13 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef MM_DEBUG #define DEBUG(_f, _a...) \ diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index ea092df074..fd1a315b77 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -5,17 +5,17 @@ * Does not handle fragments or extras. */ -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include DECLARE_WAIT_QUEUE_HEAD(netfront_queue); diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c index 70ea89b82d..d8a5a946fc 100644 --- a/extras/mini-os/pcifront.c +++ b/extras/mini-os/pcifront.c @@ -3,14 +3,16 @@ * Based on blkfront.c. */ -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index b1e1d288b8..c0229c5687 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -35,16 +35,16 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef SCHED_DEBUG diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c index 958e010dab..916a389644 100644 --- a/extras/mini-os/xenbus/xenbus.c +++ b/extras/mini-os/xenbus/xenbus.c @@ -15,18 +15,18 @@ * **************************************************************************** **/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #define min(x,y) ({ \ typeof(x) tmpx = (x); \ diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c index 8636ff5459..ab4f353e3e 100644 --- a/tools/libxc/xc_minios.c +++ b/tools/libxc/xc_minios.c @@ -11,13 +11,13 @@ */ #undef NDEBUG -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -- 2.30.2